From: Martin Pitt <martinpitt@gnome.org>
Date: Thu, 21 Mar 2013 08:07:23 +0000 (+0100)
Subject: loginManager.js: Check for logind, not for systemd
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4383
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a7cd4657f5acd890569c3cbb331cbef809d408cb;p=gnome-shell.git

loginManager.js: Check for logind, not for systemd

It is possible to build systemd without logind, in which case
/sys/fs/cgroup/systemd would still exist. Check for /run/systemd/seats instead,
as recommended by systemd upstream.

For details, see:
<https://mail.gnome.org/archives/desktop-devel-list/2013-March/msg00092.html>

https://bugzilla.gnome.org/show_bug.cgi?id=696252
---

diff --git a/js/misc/loginManager.js b/js/misc/loginManager.js
index 8543edea6..ce4af41e4 100644
--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@@ -76,7 +76,7 @@ const ConsoleKitSession = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface)
 const ConsoleKitManager = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface);
 
 function haveSystemd() {
-    return GLib.access("/sys/fs/cgroup/systemd", 0) >= 0;
+    return GLib.access("/run/systemd/seats", 0) >= 0;
 }
 
 function versionCompare(required, reference) {